Got rid of trailing whitespace
Upgraded unittest
Updated per the new streams API