Add missing test infrastructure.