Fix tests; hack for more_than handling