Add further support for test automation.