Update applied mainly to PaisTest.java