Revert to using -o for tests
Fix a test
Merge pull request #10 from kmcallister/otest

Test fixes