cleaned up callback and tests generate events now