Merge "Use project_reader in server test"