Test more, a bit of tidying