Unstable test
More flaky tests
Fixed the heartbeat test now the servicecontrol is no longer emitting
heartbeats during tests