Tests: Cleanup Tests (move code into methods), add CheckTreeConsistency method.