Fix negation resolving
Fix test data