Added test
Added mixin support