notes updated
test cases improved