[GAIA BUG935636] - Tests fixed