Refactoring + new fixtures

* Better code
* Added a big doctype (real one, Mails) to the fixtures