Try testing on more modern code base