moving test cases out