Refactor 11 14

This refactor brings regex queries, collection by name and tests that actually test things.
We should probably remove any expletives.