Some tweaks to unit test.
updated the gradle 2.0/3.0 specs.