reverted code in test-all.R to comply with new testthat recs and made tests pass