Sorted tests into separate files