Improve compatibility with older gcc and update tests
2 files changed