change options structure around and add pending tests
stream options