Fix tests

I hope this make all tests green. cc @timlinux