Added Building and Bathroom
Updated test location - working
Added Building and Bathroom