I fixed some bugs with calor and stuff. the test looks correct now. I hope I got everything