Added and modified some tests