Changes to fix tests that were failing after most recent rebase.