Merge "Fix test so that it runs as a JUnit 4 rather than JUnit 3 test"