Fixed bug that didn't account for array values.
Fixed tests to pass with changes made to 'option' type form fields.