Work on test class