added some tests with other rooms
cleaned up