Fixed BenchmarkTest.java
Cleaned up Benchmark class and test files