move some tests to new class
move some tests to new class