Rework test class