Test Generation updates/fixes