Fix + test case