fixed all the tests except of last one