Adding tests, updated Gradle for Tests