Fixed two more failing tests, added rooms to runtests.py