more refactoring

I think everything is wrapped in test_that now