Rspec bugfix.
Merge branch 'model_testing' into development