making no match work for some of them
fixing test cases