made tests a bit more data driven