Refactoring instrument classes.

This commit updates all experimental tests.

All editor tests now work again. All experimental tests now work again.