Improve test coverage

TEST TEST TEST WHAAAAAA

refs #16