Updated tests for new config