Update tests to rmarkdown
Eliminate use of expect_that
Fleshing out tests