Fixed timeout issues

One test takes too long when testing coverage and causes timeout error.
Another one was slightly broken and did not test that had to be tested.
Remove "hardcoded" collection names from error messages
Fixes #30
Merge remote-tracking branch 'upstream/master'