initial room tests
Merge pull request #5 from MarshallMcCoy/dans_room_changes

Changes to tests