Fix test and tidy up VanillaJavaApp