remainig unittest fails, bug fixes for _extract_values

remainig unittest fails, bug fixes for _extract_values