Add new configuration layer
Fixed broken integration tests
Fixed broken unit tests
Changes in test data