modified some tests