Add rooms that are always there to our Game constructor
Fixed tests that assumed rooms weren't in the default locations, because they are now