Tests are fixed finally