Some updates to step definitions