#refactor specs and test as one more commmentable