Refactor common variable out of tests
Refactor names
Change expectation to use arguments