Refactoring in model specs, issue #6