Tests definition improved.