Fix simple kv first tests.
Correctly call block with callbacks et al