Fixed upstream merge problems in the level editor code. Changed test map to ensure this worked