Fix tests, pull latest from master

Sorry this includes so much noise. This fixes a pair of broken tests. I've commented the changes.