FIX : fixing tests (almost done)