Added support for test directories