fixes to animator classes and test