Changing to services based approach has fixed the test which previously
only failed under Gradle.  Fixes #156