Test modifications per discussions with Jay and Eileen