Adding run type and feature scalling option, updating tests