Fixed some tests but not working