Minor changes. Unit tests (coverage 100%)