Change test dsl slightly
Delete old cucumber tests