Added cucumber and user tests