Test tidy up

Some small tidying up to tests, and adding a new one.