Forgot uuid.
Tests for fields selection (limiting).

Slight change of semantics as well.
Additional test.
Simplifying logic.