Converted remaining output-comparison tests to testthat