added coverage/fixes for value resolution issues