Improving unit tests, addind settings to perform test coverage