updated test suite to match # note
merge branch