Fixed bug with join, and expanded on tests.

Also cordoned off es5-dependent tests.