add and improve test.