Rewrite collections test
Fix logging
Don't catch that many exceptions