Adjust cucumber features
Adjust more tests