Fix and works! The test are not working anyway