Add/stream test scaffolds#tmp 164

Recreates PR since I stuffed up and forgot to rebase the branch before merging...
#4 #5