Refactor with one method of test