adjust configuration and its tests