Added data driven tests