Well, like I said, this PR was an alternate take on #2. To me it makes more sense to have Assertions and Expectations live under Capybara, but its ultimately up to you.