Update to master
Comment out a bit of a test for now