Fixes on config, test suite completed