Fix unit-tests for new $Architecture matching.