Integration test uncommitted and fixes