More tests

Move some term extraction up before short-circuit return on empty read
element