Get tests working
Remove duplicate resource ids
Merge pull request #625 from timrae/develop

Use the new gradle way of implementing unit tests