fix + improve test