Catch up to master
Update tests