test cleanup, rename, add streams tests