Getting tests working with changes from upstream