Tests passing
Put back swizzling tests still passing
Cleanup