GAP-153 - compatibility with Gradle 2.0
Fixed the tests to be compatible with the new plugin IDs