Updating to newest almost functional and gradle testing fixes