OAI tests fixed