moving test specific methods
cleanup
moving test specific function