Master test mixin fix

fix for #184