Converting to new vignette structure; moving one last test to new testthat structure