Updated tests and animation