Tweak test callbacks