#315 Errors unit tests
#315 Model unit tests