Rework on testing