Fix missing tre

Tests now pass if TRE isn't available.
Also, several regressions fixed after refactoring preview_sync.