Refactoring
Use be_[predicate] matcher
Update context