Switch to BTreeMap
Temporarily disable debuginfo in tests
Revert "Temporarily disable debuginfo in tests"

This reverts commit b32d24727e03e32bcd4c6c281145eb76c1adbd19.