Added animations and unit tests