refactored specs and updated after changes in src