Reverted to older design.
Canned test design for older, original design.
Updated design.