Refactored the way that the sync id manager is instantiated to do it dynamically depending on whether we are using fx accounts; fixed a couple of tests