Updated unit tests. 91.4% coverage