Added additional test definitions.