Renamed and fixed RoomConstrainedStorage, added unit tests for it.