better restart and kill mocks
Merge pull request #10 from Runnable/better-mocks

better restart and kill mocks