Clean up tests
Remove xctool workaround, no longer necessary