Quick patch for maintaining test compatibility with Ioannis.