Fixed Unit Test issue.