Will/grady/self assessment feedback

@wedaly , we should talk about the Test changes and the changes to models/base.py
This is concerning.  What new queries are being executed?