improve reconciliation and started integration testing