Merge branch 'development'
Using explicit ID types in TestUser
Adding a getId() with a more specific return type.
Merge pull request #1 from steve-downing/master

Pulling changes from master back into development.