added a few more not and fixed tests