modifications to tests