Finished refactoring parameters prior to test