Animation made configurable
Test updated