Cleanup
Switch tests to new ops