Add tests

Add tests, change list to use stream