Minor fixes
Fix the broken unit test