Adds number-specific expectations + relaxes requirement on 'Comparable'