Moved tests from output to outputs (close #2591)