Revert to using -o for tests