Changes in tests, some excercises