Got rid of unused class and interface test.