Refactor: removing duplicate tests