Working on test class