Did some cleaning in the test classes