modified test generation schema