Rewritten tests, removed mixin, added many assertions