Tidied up build.gradle, moved resource files to src/test/resources and updated dependencies