move test files
add missing meta file
conflict