Fix models and add test data