Converted tests to use Spock and JUnit

Most tests now run using either Spock or JUnit rather than TestNG.
ControlTests.java deleted as it is now redundant.
DataGeneratorTests.java now converted to run using JUnit.