Cucumber step rework

Preparation for implementing signout

Reworded the scenarios a bit, so I could then reuse some steps

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>