Additional tests and test infrastructure.