New tests. Coverage (by OpenCover) ~ 22%.