Initializers. Some corrections. Tests.