Move last remaining tests out of models.py files; prep for test discovery.