Added additional test case and tried to fix the last one