Fixes tests broken by b89e5e03