Task #14092 refactor specs
Merge pull request #166 from johnny-miyake/task14092

ggTask #14092 refactor specs