Moved TestDirectory to a different file
Merge