Making step definitions more generic