Fixed two test failure