Pull in changes from @armon
Add system consul_test