Re-add streaker tests
Change api to return a function