Tweak test commands