clean up framework, put tests in place for some of the additive mixins