Add tests and Mixin