Unit Test fixed