--test added and --mode is removed