adding more generic test cases and data-sets to test