Updating mixins/tests in preparation for docs
Adding lots of documenty goodness