Update server-side unit tests for node hierarchy refactoring