Prepare small data model for tests; fix some issues