Test cases clean up round 1