modified more tests