Merge "update_crate_tests: Clean up"