Refactor to add more parameters to test