Fix breaking tests