[TASK] Adds some tests.
[TASK] Add some more optional fields.

name, firstName, lastName and a language field.