full coverage tests and mixins bug fix