Fix tests, pull latest from master