Cleared old tests (replaced by documentation). Fixed up some mixins based on docs work.