added new test and other tests fixed