clean up tests for compatibility with new testthat