Move unit test from ServiceControl