Small improvement to tests