Refactor test dungeon