Fixing failing tests due to the architecture being included in the path.