Changed launchwait to default to "no". Short running tests will fail to launch otherwise. Minor other refactoring and added test mintest