Add support for external tests