Minor cleanup + unit tests for room
Add cave tests