Remove test streams and add shameless self plugs