Made test more data driven