Changed the way negations are handeled fixing some unit tests