Fix hopscotch tests again