[#1431]Imporved tests
[#1431]Imporved tests