done with more additions to test suite