Add tests for sync, cleanup a bit.

Add __init__.py to util so tests can import the sync functions