Refactor test - make it data driven