refactor specs for models