Extended sample data and adjusted unit tests.