Last bit of cleanup (removed function call at end test cases)