Fixed some silly errors from previous refactor.
100% test coverage.