got it working, test needs to be adjusted
Updating tests
Merge pull request #1 from topcoat/mixin-mixup

got it working, test needs to be adjusted