Refactor 11 14

This refactor brings regex queries, collection by name and tests that actually test things.
Oh yeah I agree. That's some leftovers from the old stuff. fixing it.