Issue #272: Adds Integration Test
Issue #272: Out of sync when following specific workflow