Switched other tests to cmp helper