initial complete (still redundant)
made cucumber tests more declarative, compact, added steps