Fixing 4-3 impl and adding better test case