Will/grady/self assessment feedback

@wedaly , we should talk about the Test changes and the changes to models/base.py
Style nitpick: please follow the indentation conventions:
```
(
    u"Line one"
    u"Line two"
)
```