Initial commit of upgrade test code