Slightly improved tests

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>