additional sync tests, bug fixes, dried up some code in export