Fix the slow itest with a hacksaw (change the .equals() method)
Fix the build