Added some tests. Added convencience annotation names for @fields.