closes #286 with additional join tests