Repared unit tests. Code coverage up to 97%.