Remove IN conflict
Remove list_display conflict
Fixd tests