Fix unit test configuration.

* Refactoring
8 Updated fixtures.