Merge pull request 143 from dturanski/BATCH-1908-JUnit