Added a fix for changing protocols with a sync and some extra integration test scenarios

Change-Id: Ic41ffbac50dec177e164087c291e9a30cefcc80e