Refactor drh.sh
Improve spec