Refactory data model, improve testing output