clean up imports
add batch test