Restructure tests into more appropriate files