Removed test animation modifications for the time being. Will try to implement later on.