Add explicit test for config file and SpringApplication
Tidy up some tests