Merge pull request #508 from dtex/animation-tests-refactor

Refactor animation for easier/faster testing