Spread some @covers annotation goodness around
Merge branch '4.0' into 4.1
Merge branch '4.1'
Mark a test as risky when its method is annotated with @todo