Some tests for pictures

* Model and feature specs
* Refactored some factories