Adding test script, changing params to possibly less confusing names