Simplify testing infrastructure