Splitting out our tests into two separate files