Update suite to handle passing callables