Everything is fixed! make test runs fully!