Test fixes and cleanup

I'm going to start working on some local features (with pull requests coming soon) but saw that the tests might like a little TLC. The meat of this PR is that some of the tests could actually fail without being reported. This turns some bare expressions into assertions.