Rename tests and tidy up as per pull-request review.

Signed-off-by: John Oliver <johno@insightfullogic.com>