Fixed some linting errors and made the merge_streams() code cleaner as well as added more unit testing

Cleaned up merge_stream(), takes empty channels out at the beginning and adds them in before the merge() function