#11 updated tests