Added more tests to RoomTests and marked where the tests end in the Room file