Fixed the tests to use the batch Structure
Merge remote-tracking branch 'origin/master'