modified some more tests