TEIID-2996 correcting the default and adding other test logic