Move clean to end of test again