Partial Test changes for 2419fix