Issue #3254834: Make tests compatible with Commerce and add Type Hinting No Return(Void)