Made unit tests more reflective of what their class now does.
More unit test cleanup. Killed a couple of TODO items. A little PEP 8 work.