Added expanded shakedown-sync, but the new tests fail at the moment.  Need Dillan to check.