Dont wait so long for shutdown
Merge branch 'nav_test' into breaking_point
Use ipa_tests_real