Fixed tests, still having issues with plural models

Going to run a migration to try to change all models to singular,
wanted to save before I did.