Minor additions to tests