Tweak test code