Updates to Maze and MazeTest