add test tool
split test to make it faster
fix zero-files-bug
fix losing properties
Merge in fix for zero-sized files.