Reverting payload test changes