Removed default instance.
Updated tests.