restructured tests to use new node encodings