Improve test strengh