Making updates to clean up failing test provided by Timothy.