Merge "added parameterized TEST_IMAGE, TEST_TEMPEST_IMAGE and TEST_SUITE"