Re-organising the tests into separate files