move models, reduce fixture, more logging