add exta kwarg test, simplify args logic