completed FloorPlan and unit tests