Clean up tests with new CHECK() macro