A bunch of Gradle test fixes

Gradle doesn't like implicit resource imports caused by manifest merger (only in test projects).