[SPARK-2024] Test refactoring and adding couple unbatched cases