Removed circular references.
More unit tests.