Avoid Option while generating call site & add unit tests