Uncomment two tests lost in prior changes