apply PR #116 and adopt spec tests