Moved test files to test dir