Improve test coverage

It's pretty weak right now.