Junk commit
Updated gradle build file to work with gradle 2.1
Fixed test that was expecting the wrong result