Add more instrument tests.