Privatezone: Adding unit/integration test coverage