Updates to tests