Unit tests simplification