More tests. Bug fix for sync checking.