Fix bad merge
Update tests