Merged important fixes, test passing
removed full outer join from all.equal (more efficient to use count)
removed full outer join from all.equal (more efficient to use count)