Flushing out more of the unit tests, some new code