Merge pull request #2 from go-yaml/rename-imports

rename imports in test files