[GAIA BUG984584] - Remaning test suite