Acceptance Test refactoring for catalog features

Reviewers

@hmunfru @jesuspg

Description

Acceptance Test Refactoring for catalog features