Fix test regressions created by mixin changes