Improve existing tests and ad multi config test