Make rooms unit tests pass