ADD test to mixin, FIX functions