convert more tests to work with "not"