Added specs and coverage