Added another failing cucumber feature
Extracted factory method
Replaced checks with matchers