Fix deprecations: Using 'Given/When/Then' in step definitions is deprecated, use 'step' to call other steps instead