Fix tests and add Utils.resolveValue test.