Add infrastructure for tests