Enabling--and fixing--all tests

Tests were generally disabled at some point.  I'm re-enabling them, then solving all the test issues.

I'm opening this PR now so that Travis-CI will build and I can debug (running locally is painful, as all may remember).

So when this PR shows a green check-mark, you know it's ready for review / merge :)