Fixed half of the tests