Fix issue with processing non-object values & update related tests