Misc style stuff
Fix P1RoomGeneratorTest