Fix Cucumber deprecation warnings

Created by: exviva

This removes the following warning:

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