Refactor contributing health and mass values to BoatBuildingBlock so we can control values for each block type. Some cleanup. Add couple more test saves.