reworking test variable and type definitions.