revert test changes for #341