Code cleaning
Adding static fields for data in config files.
Refactoring failing tests