We generally opt for $this->setExpectedException over the annotation, but I'll make this change. Otherwise looks good, I'll merge!