Fixed more broken test cases, added more stuff to the RoomsBundle