Moving tests into a test suite so that it's easier to add in the future