Backed out TestBench 4 changes
Fixed problem with inconsistent test results, 'cleantest' added to Gradle script