Refactored single result processing, fixed changeset test fail