Added Config test
Refactored Configuration builder
Implemented new config