issue #419 - fixed some longstanding callback bugs in tenant tests