Change step definitions to static methods