final changes to tests