Upgrade test to match pbsnodes output enhancements