Fix failing tests

This patch fixes failing tests form the consul
commit.