Mixin improvement + some iterable tests