More animation tests. Fixed a small performance issue.