More updates to tests