cleanup up some things, fixing some tests, making other tests to get better code coverage
testing