Merge bradunbar's test tweaks+min/max test