Update for most recent master and try to get tests working again