Added retype to all tests using a new type

Signed-off-by: Bert Hajee <hajee@moretIA.com>