added and modified some tests after solution