remove batch test
fix formatting issues