Reworked config class, working on unit tests