Http api shards

I'm good with avoiding the extra stuff since it's already in the test package. And we won't have to go back and update all the existing tests to make it consistent ;)