Add run-tests script and cleanup tests

issue2121
issue2420
review2491002