Fix test extras setup and Make mismatch.