Get tests working
Remove duplicate resource ids