Added Floors and testFloorName()