Make existing unit tests work with new code base. Also add new tests for new code to existing tests.
* Allow to filter results by field values.