reworked some of the tests, added some coverage, added a todo