Improve spec tests to use Version for Scenario Outline. Fix issue found by spec tests.