Use explicit org names in test - fixes build