Fixing build.gradle and test hanging issue
merging with master
Removing merge remnants
Merge pull request #43 from DemandCube/dev/kingofpoptart

Fixing build.gradle and test hanging issue