Fix test (bad merge)