Add test trees, expand tests, refactor tests.