Add test.
Some updates.