adds a workaround for a code coverage bug, removes special 'changeset' handling