Fix issues

Make project compile by adding Tenant
Add missing cleanup to reader test