Comply with the changes in Unexpected 3
Make code coverage work
Point to unexpected 3.0 from vendor dir
added assertion 'was [always] called with match'
Version 3.0.0
Merge from master