Adding some test infrastructure.