Fixed: failed arch tests