Remove obsolete argument
Move protocol test to end of suite and extend timeout

The keygen test works without native client, but it takes a loooooong
tiiiiiiime.