Updated unittest. It covers 85%.