Fix test due to #562 changes