Additions to tests