Revert to using -o for tests
Merge pull request #52 from kmcallister/otest

Revert to using -o for tests