Cleanup mixin tests
Merge pull request #205 from fabien/feature/plugins

Cleanup mixin tests