more tests.
and more
cleaning up
more cleaning up
more tests
cleaning up
removed incorrect assertion