Added proper specs and changed test path