removing duplicated spec setup + refactoring