Add tests and use _.mixin
Use _.mixin + test