Add validate_options conditions back in with test for :credential this time

Missing this out caused some tests to fail.