* Move instantiation of terminal plugin earlier * Move test for invalid network_os to where the failure now lives