refactor make tests look similar