modified some unit tests