Fixed the mess from previous commit. Updated test case.