[DO NOT MERGE] Added few new tests, converted few to data-driven and few to only-cvs 

It's Done, needs to be tested for the instance provisioning.