fix spelling
isolate streams tests
move forgery generation to FactoryGirl and DRY some tests