Fixed tests:  71% coverage