move some tests into subfolders