Added test individual.
Some changes of arhitecture.