Implemented some step definitions