use correct URLs for sync
some more tests and clean up