Fine-tuning of unit tests and example