Added maneuver tests, small fix in viewing files.