Working on unit test
Adding animations