Fixed some issues with mock implementation of sync up