More robust test system