fixed all tests (except that json one)