Reduce boilerplate in new test framework