fixed some tests, but still some not working