Added few new tests, converted few to data-driven and few to only-cvs