Add specs and fix argument issue