Remove field list view
Fix data tests