remove the Floorplan.all condition and make the original index test more robust