Moved tests from output to outputs (close #2591)
Merge pull request #2911 from aeslaughter/tests-2591

Moved tests from output to outputs
Merge commit 'a1859b4f7859baa858bdea05c56dbbcb8a7f089c'