Removing streams module and splitting up tests