Final tests fix