Change tests, refactor to more Actor-model style.