Remove static Stream variable and updated tests