more refactor specs