Did some more on step definitions