add split tests
move some tests