adding support for cross version test cases

Change-Id: I13de30825ffe2034f7543ca266ffc0a81d654a37