First tests passing security implementation.
Encapsulated MappingData fields.
Passing tests for security annotations.
More tests and a little fix.