added runModel mode. tests cleanup