move test files to test/ directory
Merge branch 'vim-flavor'