Fix of Unit Test