Improve test coverage. Yay!