Apply ADmad's patch and update testConfig method according to a new specification.