Adding updated sync manager and corresponding test cases