Added configuration.
Changes made in tests.
Finished the unit tests.