Configuration: add storer, removed factories
Configuration: Added test