Your rebase has blown away new code (i.e. this test landed yesterday).  Can you add this back?