Added tests for combining current state with updates. hopefully made it more robust