Fixed a few more failing sync tests