Updated test for changes brought in by rebase