At the moment, plan is to use the same set of tests.. So, don't need these changes yet.