more tests and refactoring: animations