fix tables mixin
fix tests, now work cross-platform