fixing callback on join and tests