Cucumber test added and model changed for merge