Cleanup cmp tests