Merge pull request #548 from pminten/avltree-tests