Started Adding Unit Tests Around Service