[Do Not Merge] Added few new tests and converted few to data-driven