Reviewed gradle files, committed intellij files
Fixed tests so that all run