Added subdirs to test runner