More fixes to test config