Fixed sub arity 0 and 1, fixed tests