more on improving cataloguesource access + a ton of tests