Feature/add batch unit test