s4-test: added --rebase and --clean options