Added support for system tests.