Some tests are fixed