Split remaining tests into their own files