CATS-575 created methods and views required for the integration
CATS-575 Updated after merge
Fix failed tests