Additional test infrastructure for solano.