Expand test coverage in main test

Signed-off-by: Ted Young <tyoung@pivotallabs.com>
Refactor to use group_runner and heartbeater

Signed-off-by: Ted Young <tyoung@pivotallabs.com>
Godeps

Signed-off-by: Ted Young <tyoung@pivotallabs.com>