Update tests broken by merging #203