Solving configurability issues

We have to solve some configurability issues related to
UnitTests and dependencies with optional DAOs. Previously,
all DAOs would be in the final products.