Fixed multiple issues with the configuration, also updated the tests