[2642]More tests and better results