Unit tests updates for genetic algorithm changes and some refactoring.
Also udpated spring beans context.