Converted half the test fixtures for devtools::test()