Accidentally removed too much; fixes tests