Tests are fixed