Improve test (it is still not entirely fixed).