Some tests were fixed