Adding new step definitions and modifying a few old ones.