reintroduce properly model tests