Optimizes catalog index creation and adapts unttest data
Merge pull request #371 from nsendetzky/master

Optimizes catalog index creation and adapts unttest data