move some tests to session