Refactor most remaining test to align with current parse tree