[JAVA-1390] Phase 1: cleaning up the current build. Simplified our testing dependencies to use the 4.10 JUnit that's included in Spock. Means we can't use assertNotEquals and assertFalse, but we should be using assertThat anyway.