Refactor test - make it data driven - set up data in test