added test infrastructure