clean up model stack tests, make them unit