Update stream-attr type because reserved word, Add tests
Add more tests