Reached 85 % Code Coverage.

Several unit tests added.