minor refactoring and fixed tests for pull request #18
added build.xml for testing junit-dataprovider using ant junit task