Move test files to common location.
Moving test files from this too.
Moving one more test file over.