Adapt class for test
Cataloguetest
Merge remote-tracking branch 'origin/master'