Make both auto and manual test work