Fix Unit tests.
Add some animation.