Added in tests for components and streams