Continue Cucumber features cleanup and expansion