Fixed a few bugs
Fixed a typo
Updated rooms, tests cover more and are all passing now