added run tests and tweaked run