Added config to tests and made some compatibility fixes