Moving multiple tests into each file