Clean up the test cases by using the implemented functions