Increase timeout, and change npm test to invoke make.