Reorder input parameters
Increase TravisCI coverage