Cleaned up cucumber scenarios and steps