Eliminated Given/When/Then step definition deprecation warnings