Added ArgumentResolver
Fixed tests after changes in toString() methods