Cosmetic changes in unit test
Re-added addChild methods for backward-compatibility (marked as deprecated).
Used new Macro framework for btrees in example