Fix make test and speed up fib39