Adding better assertions.
Extracting out By and finishing up ExpectedConditions.