Added negator adaptor
Switched to negator adaptor, added test cases