Traditionally the start/stop test was the last, so move it back to there
(added as last option in commit 854).

Reviewed-by: amishchenko