- Organized unit tests and added a couple more of them
- Added a missing null check and a missing Dispose() call on a Stream