more changes to test.class