First pass refactoring after code review. Second set of run test utils to follow for node view changes.