34fcc85 Test cases clean up.