commit more script and tests