Fixed tests to run from Gradle.  Cause of difference is use of Guice in
test cases, where Guice creation order is not specific, it may vary
between IDE run of tests and Gradle run of tests.