fix tests due to the new type management