testGetsAllVersionsFromCriteria
Fix test
testCalculateManuallyFromOptionsWith2YearLimitDifferentVersions
Make all tests work with versions