Fixes tests broken by 2b21274