added cmd runs between tests, added more tests.