Model tests and fixes; Syncer tests fixes