More tests and ensure valid branches before adding to configuration
Fixed ambiguous cucumber tests