Fixed gradle build, Removed Tests