Refactor tests and start to add closed attribute

* Implement Guard
* create a migration to add a 'closed' attribute
* Test refactors