fixed data model, now it passes both dataRefresh and rowCount tests