Moved test dir
Revert "Moved test dir"

This reverts commit 61d6000c7a2a23a63c2d8cae4121c9066bf09c81.