Perform rewiring for mixin

Closes #25. Test disabled because we need a change in scala first