More tests and more testable
Tests for ModelValueExtractor
ModelStateAdapter tests