Arranged testAddRooms
Merge origin/master