Remove unused private classes within the test