Merge from Perforce
Exploit new defined keyword for setup/teardown test case