FIX test harness for tenants (ongoing)