Updated unittest. 89% is covered.