Clean up and add more checking for pull test cases