Added new classes to split up types of streams. Added test classes to check the types of streams