Fixed up unit tests.  However, it's important to note that https://github.com/laravel/framework/pull/2645 was applied manually to vendor source. I feel dirty.