Fix ivy_utils tests
A bunch of cleanup to get a good PEX building