another attempt at wrapping the tests