Merge tests as requested by claudep