Refactor test to be less massive