Add more unti tests.