Added RoomTrap and tests
Added RoomTrap and tests