Increased Unit Tests' code coverage