add dev.txt
add test files.
merge dev with no-ff