Working on mixin redirection testing/bugfixes