Fix missing args exceptions and tests