(refactor) Modifying tests