code cleanup, additional tests
test suite complete