Make existing unit tests work with new code base. Also add new tests for new code to existing tests.
Add test to cover option to configure user defined additionalWhereClause.