Added several instances. Refactored tests.