update test suite
rebuild final data files for uploading
update readme
merge