Fix a couple of broken tests
Update Cask config