seperated and added test cases, added negationcommand