XD-784 - Fixes for Windows compatibility
- Added blank line EOF at gradle.bat
- Fixed tests