refactor: reorder model tests to mirror models.py file better
refactor interest stats to use aggregate query