Additional fixes on unit testing example