impl + test fix

pls review