Remove Config class and use class property
Merge branch 'Config' into tests