Relax regex to allow varying lengths and reinstate tests#1

ehogan merged 1 commit intoehogan:correct_stash_regexehogan/iris:correct_stash_regexfrom

djkirkham:correct_stash_regexdjkirkham/iris:correct_stash_regexCopy head branch name to clipboard